From c9505fed46d01e09c377d38017b47688b03476f3 Mon Sep 17 00:00:00 2001
From: "katzj@redhat.com[iap10]" <katzj@redhat.com[iap10]>
Date: Fri, 15 Apr 2005 22:00:50 +0000
Subject: [PATCH] bitkeeper revision 1.1159.258.97
 (42603992S3sF-t0yBth7NEBevozVOg)

[PATCH] Make non-native python path handling a
> > Although I don't really agree with the installing of the
> > python bits to the non-native paths, I can see where it's
> > useful as long as the module ABI doesn't change if you're
> > trying to distribute binary tarballs.  But with the current
> > handling it adds module lookup costs for the native path case
> > (which would be the norm) as well as prevents using
> > PYTHONPATH to look to a different location for the modules.
> >
> > The attached patch changes things so that at first, the xen
> > module is attempted to be imported from the stock paths.  If
> > we get an ImportError exception, then it adds /usr/lib/python
> > to the end of the python path and imports again.
>
> Do you prefer this to just unconditionally addding /usr/lib/python to
> the end of the path rather than the front?

Slightly, but just because having /usr/lib/python in my sys.path is
ugly :-)  I can look over it, though... patch doing that attached

Signed-off-by: Jeremy Katz <katzj@redhat.com>

===== tools/misc/netfix 1.13 vs edited =====
---
 tools/misc/netfix | 4 ++--
 tools/misc/xend   | 4 ++--
 tools/misc/xensv  | 4 ++--
 tools/misc/xm     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tools/misc/netfix b/tools/misc/netfix
index ab5a04cdef..32f1021732 100644
--- a/tools/misc/netfix
+++ b/tools/misc/netfix
@@ -9,8 +9,8 @@
 
 from getopt import getopt
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
+# add fallback path for non-native python path installs if needed
+sys.path.append('/usr/lib/python')
 from xen.util.Brctl import *
 
 short_options = 'hvqni:b:c'
diff --git a/tools/misc/xend b/tools/misc/xend
index d19a4868f6..a73ca579a8 100644
--- a/tools/misc/xend
+++ b/tools/misc/xend
@@ -22,8 +22,8 @@
 import os
 import sys
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
+# add fallback path for non-native python path installs if needed
+sys.path.append('/usr/lib/python')
 from xen.xend.server import SrvDaemon
 
 class CheckError(ValueError):
diff --git a/tools/misc/xensv b/tools/misc/xensv
index 7924840615..8596457cd7 100755
--- a/tools/misc/xensv
+++ b/tools/misc/xensv
@@ -22,8 +22,8 @@ import os
 import sys
 import re
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
+# add fallback path for non-native python path installs if needed
+sys.path.append('/usr/lib/python')
 from xen.xend.server.params import XEND_PID_FILE
 
 class CheckError(ValueError):
diff --git a/tools/misc/xm b/tools/misc/xm
index 86e45573d0..6bf8931323 100755
--- a/tools/misc/xm
+++ b/tools/misc/xm
@@ -2,8 +2,8 @@
 #  -*- mode: python; -*-
 import sys
 
-# Default install path for Xen binary packages.
-sys.path = [ '/usr/lib/python' ] + sys.path
+# add fallback path for non-native python path installs if needed
+sys.path.append('/usr/lib/python')
 from xen.xm import main
 
 main.main(sys.argv)
-- 
2.30.2